bitkeeper revision 1.1159.187.5 (41a48ea4noDXAKVgDzH9BvR43D1OQg)

Simplify includes.

diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c
index d130c623df9f384b44a04610b6b9a2cd242df74c..62eb07ada0bf59ff972883a7876b5383da739dd9 100644 (file)
--- a/xen/arch/x86/i8259.c
+++ b/xen/arch/x86/i8259.c
@@ -7,6 +7,7 @@
 
 #include <xen/config.h>
 #include <xen/init.h>
+#include <xen/types.h>
 #include <asm/regs.h>
 #include <xen/errno.h>
 #include <xen/sched.h>

diff --git a/xen/include/asm-x86/x86_32/regs.h b/xen/include/asm-x86/x86_32/regs.h
index fcf1cd5e6bb85f14ce0cb19f84ff5195ed3db1e3..a4fdcc663a43e5b22011a01c5083d9c6e1b0a1d2 100644 (file)
--- a/xen/include/asm-x86/x86_32/regs.h
+++ b/xen/include/asm-x86/x86_32/regs.h
@@ -1,8 +1,6 @@
 #ifndef _I386_REGS_H
 #define _I386_REGS_H
 
-#include <xen/types.h>
-
 struct xen_regs
 {
     /* All saved activations contain the following fields. */

diff --git a/xen/include/xen/keyhandler.h b/xen/include/xen/keyhandler.h
index e3d49c9086a237378d66e1fd4be7407ccfff2145..3c7c36ef667626e1aeade14079c81ea255d358e6 100644 (file)
--- a/xen/include/xen/keyhandler.h
+++ b/xen/include/xen/keyhandler.h
@@ -10,7 +10,7 @@
 #ifndef __XEN_KEYHANDLER_H__
 #define __XEN_KEYHANDLER_H__
 
-#include <asm/regs.h>
+struct xen_regs;
 
 /*
  * Register a callback function for key @key. The callback occurs in